diff --git a/changelog.md b/changelog.md
index c1a7de7a..943c5b6e 100644
--- a/changelog.md
+++ b/changelog.md
@@ -2,6 +2,7 @@
 
 ## Version {next}
   - Update micropub endpoint to support access tokens being sent in either acceptable form
+  - Improve admin control panel forms
 
 ## Version 0.15.1 (2018-01-06)
   - Update dependencies and recompile frontend assets, fix tests
diff --git a/public/assets/css/app.css b/public/assets/css/app.css
index 240f1f1e..6f17eef1 100644
--- a/public/assets/css/app.css
+++ b/public/assets/css/app.css
@@ -1,2 +1,2 @@
-html{-webkit-box-sizing:border-box;box-sizing:border-box}*,*::before,*::after{-webkit-box-sizing:inherit;box-sizing:inherit}html{font-size:10px;font-family:"filson-soft", serif}a.u-syndication{text-decoration:none}#topheader{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-flow:row;flex-flow:row;-webkit-box-align:center;-ms-flex-align:center;align-items:center;width:100%;min-height:5rem}#topheader h1{font-size:2rem;padding:0 2rem}#topheader nav{font-size:2rem}main{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;-webkit-box-align:stretch;-ms-flex-align:stretch;align-items:stretch;max-width:512px;margin:0 auto;padding:0 0.5rem}.h-entry{font-size:2rem}.top-space{padding-top:2rem}.mini-h-card{position:relative}.mini-h-card .p-name{position:relative}.mini-h-card:hover .p-name{z-index:100}.hovercard{position:absolute;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;-webkit-box-align:end;-ms-flex-align:end;align-items:flex-end;background:white;width:30rem;left:-10px;top:-10px;z-index:50;padding:2rem 1rem 1rem;border-radius:2px;-webkit-box-shadow:3px 3px 2px 1px #101314;box-shadow:3px 3px 2px 1px #101314;display:none}.mini-h-card:hover .hovercard{display:-webkit-box;display:-ms-flexbox;display:flex}.mini-h-card .social-icon{width:auto;height:2rem}.mini-h-card .u-photo{height:10rem}.note{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;font-size:2rem}.note img{max-width:100%;max-height:80vh}.note-metadata{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.icon{width:auto;height:1em}.pagination{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:space-evenly;-ms-flex-pack:space-evenly;justify-content:space-evenly;font-size:2rem;list-style-type:none}main .contact{font-size:2rem;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:reverse;-ms-flex-direction:row-reverse;flex-direction:row-reverse;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;margin-top:2rem}.contact .u-photo{width:auto;height:8rem}#projects{font-size:2rem}body>div.h-card{max-width:512px;margin:0 auto;font-size:1.5rem}footer{max-width:512px;margin:0 auto;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.p-bridgy-twitter-content,.p-bridgy-facebook-content{display:none}span[role=img][aria-label]{position:relative}span[role=img][aria-label]:focus::after,span[role=img][aria-label]:hover::after{position:absolute;display:block;z-index:1;bottom:1.5em;left:0;max-width:5em;padding:0.5em 0.75em;border:0.05em solid #fff;border-radius:0.2em;-webkit-box-shadow:0.15em 0.15em 0.5em #000;box-shadow:0.15em 0.15em 0.5em #000;content:attr(aria-label);background-color:rgba(0,0,0,0.85);color:#fff;font-size:80%;-webkit-animation:TOOLTIP 0.1s ease-out 1;animation:TOOLTIP 0.1s ease-out 1}@-webkit-keyframes TOOLTIP{from{bottom:0.5em;background-color:transparent;border:0.05em solid rgba(255,255,255,0);color:rgba(255,255,255,0);-webkit-box-shadow:0 0 0 #000;box-shadow:0 0 0 #000}to{bottom:1.5em;background-color:rgba(0,0,0,0.85);border:0.05em solid #fff;color:#fff;-webkit-box-shadow:0.15em 0.15em 0.5em #000;box-shadow:0.15em 0.15em 0.5em #000}}@keyframes TOOLTIP{from{bottom:0.5em;background-color:transparent;border:0.05em solid rgba(255,255,255,0);color:rgba(255,255,255,0);-webkit-box-shadow:0 0 0 #000;box-shadow:0 0 0 #000}to{bottom:1.5em;background-color:rgba(0,0,0,0.85);border:0.05em solid #fff;color:#fff;-webkit-box-shadow:0.15em 0.15em 0.5em #000;box-shadow:0.15em 0.15em 0.5em #000}}@media print{span[role=img][aria-label]::after{content:" (" attr(aria-label) ") "}}.map{height:200px}.mapboxgl-ctrl-logo{border-bottom:none}.marker{background-image:url(data:image/png;base64,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);background-size:contain;width:20px;height:20px}.map-menu{position:absolute;top:0;left:0;background:white;padding:0.4rem}.map-menu label{margin-left:3px;margin-right:3px}body{background-color:var(--brwhite);color:var(--black)}#topheader{background-color:var(--black);color:var(--white)}a,a:visited{color:var(--blue)}h1 a{text-decoration:none}#topheader a{text-decoration:none}.tags{margin:0;overflow:hidden;padding:0}.tags li{float:left;list-style-type:none}.tag,.tag:visited{background:var(--white);border-radius:3px 0 0 3px;color:var(--black);display:inline-block;height:2.6rem;line-height:2.6rem;padding:0 2rem 0 1rem;position:relative;margin:0 1rem 1rem 0;text-decoration:none;-webkit-transition:color 0.2s;transition:color 0.2s}.tag::after{background:var(--brwhite);border-bottom:1.3rem solid transparent;border-left:1rem solid var(--white);border-top:1.3rem solid transparent;content:'';position:absolute;right:0;top:0}.tag:hover{background-color:var(--red);color:var(--black)}.tag:hover::after{border-left-color:var(--red)}
+html{-webkit-box-sizing:border-box;box-sizing:border-box}*,*::before,*::after{-webkit-box-sizing:inherit;box-sizing:inherit}html{font-size:10px;font-family:"filson-soft", serif}a.u-syndication{text-decoration:none}#topheader{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-flow:row;flex-flow:row;-webkit-box-align:center;-ms-flex-align:center;align-items:center;width:100%;min-height:5rem}#topheader h1{font-size:2rem;padding:0 2rem}#topheader nav{font-size:2rem}main{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;-webkit-box-align:stretch;-ms-flex-align:stretch;align-items:stretch;max-width:512px;margin:0 auto;padding:0 0.5rem;font-size:2rem}.top-space{padding-top:2rem}.mini-h-card{position:relative}.mini-h-card .p-name{position:relative}.mini-h-card:hover .p-name{z-index:100}.hovercard{position:absolute;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;-webkit-box-align:end;-ms-flex-align:end;align-items:flex-end;background:white;width:30rem;left:-10px;top:-10px;z-index:50;padding:2rem 1rem 1rem;border-radius:2px;-webkit-box-shadow:3px 3px 2px 1px #101314;box-shadow:3px 3px 2px 1px #101314;display:none}.mini-h-card:hover .hovercard{display:-webkit-box;display:-ms-flexbox;display:flex}.mini-h-card .social-icon{width:auto;height:2rem}.mini-h-card .u-photo{height:10rem}.note{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;font-size:2rem}.note img{max-width:100%;max-height:80vh}.note-metadata{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.icon{width:auto;height:1em}.pagination{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:space-evenly;-ms-flex-pack:space-evenly;justify-content:space-evenly;font-size:2rem;list-style-type:none}main .contact{font-size:2rem;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:reverse;-ms-flex-direction:row-reverse;flex-direction:row-reverse;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;margin-top:2rem}.contact .u-photo{width:auto;height:8rem}#projects{font-size:2rem}body>div.h-card{max-width:512px;margin:0 auto;font-size:1.5rem}footer{max-width:512px;margin:0 auto;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.admin-form{margin-top:2rem;margin-bottom:2rem}.form{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column}.form>div{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column}div.form-row{-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row}.p-bridgy-twitter-content,.p-bridgy-facebook-content{display:none}span[role=img][aria-label]{position:relative}span[role=img][aria-label]:focus::after,span[role=img][aria-label]:hover::after{position:absolute;display:block;z-index:1;bottom:1.5em;left:0;max-width:5em;padding:0.5em 0.75em;border:0.05em solid #fff;border-radius:0.2em;-webkit-box-shadow:0.15em 0.15em 0.5em #000;box-shadow:0.15em 0.15em 0.5em #000;content:attr(aria-label);background-color:rgba(0,0,0,0.85);color:#fff;font-size:80%;-webkit-animation:TOOLTIP 0.1s ease-out 1;animation:TOOLTIP 0.1s ease-out 1}@-webkit-keyframes TOOLTIP{from{bottom:0.5em;background-color:transparent;border:0.05em solid rgba(255,255,255,0);color:rgba(255,255,255,0);-webkit-box-shadow:0 0 0 #000;box-shadow:0 0 0 #000}to{bottom:1.5em;background-color:rgba(0,0,0,0.85);border:0.05em solid #fff;color:#fff;-webkit-box-shadow:0.15em 0.15em 0.5em #000;box-shadow:0.15em 0.15em 0.5em #000}}@keyframes TOOLTIP{from{bottom:0.5em;background-color:transparent;border:0.05em solid rgba(255,255,255,0);color:rgba(255,255,255,0);-webkit-box-shadow:0 0 0 #000;box-shadow:0 0 0 #000}to{bottom:1.5em;background-color:rgba(0,0,0,0.85);border:0.05em solid #fff;color:#fff;-webkit-box-shadow:0.15em 0.15em 0.5em #000;box-shadow:0.15em 0.15em 0.5em #000}}@media print{span[role=img][aria-label]::after{content:" (" attr(aria-label) ") "}}.map{height:200px}.mapboxgl-ctrl-logo{border-bottom:none}.marker{background-image:url(data:image/png;base64,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);background-size:contain;width:20px;height:20px}.map-menu{position:absolute;top:0;left:0;background:white;padding:0.4rem}.map-menu label{margin-left:3px;margin-right:3px}body{background-color:var(--brwhite);color:var(--black)}#topheader{background-color:var(--black);color:var(--white)}a,a:visited{color:var(--blue)}h1 a{text-decoration:none}#topheader a{text-decoration:none}.tags{margin:0;overflow:hidden;padding:0}.tags li{float:left;list-style-type:none}.tag,.tag:visited{background:var(--white);border-radius:3px 0 0 3px;color:var(--black);display:inline-block;height:2.6rem;line-height:2.6rem;padding:0 2rem 0 1rem;position:relative;margin:0 1rem 1rem 0;text-decoration:none;-webkit-transition:color 0.2s;transition:color 0.2s}.tag::after{background:var(--brwhite);border-bottom:1.3rem solid transparent;border-left:1rem solid var(--white);border-top:1.3rem solid transparent;content:'';position:absolute;right:0;top:0}.tag:hover{background-color:var(--red);color:var(--black)}.tag:hover::after{border-left-color:var(--red)}
 /*# sourceMappingURL=app.css.map */
\ No newline at end of file
diff --git a/public/assets/css/app.css.map b/public/assets/css/app.css.map
index 34b4c704..6d567cfd 100644
--- a/public/assets/css/app.css.map
+++ b/public/assets/css/app.css.map
@@ -1 +1 @@
-{"version":3,"sources":["../../../resources/assets/sass/_border-box.scss","../../../resources/assets/sass/_base-font.scss","../../../resources/assets/sass/_header.scss","../../../resources/assets/sass/_variables.scss","../../../resources/assets/sass/_main.scss","../../../resources/assets/sass/_hovercard.scss","../../../resources/assets/sass/_notes.scss","../../../resources/assets/sass/_pagination.scss","../../../resources/assets/sass/_contacts-page.scss","../../../resources/assets/sass/_projects.scss","../../../resources/assets/sass/_footer.scss","../../../resources/assets/sass/_bridgy-links.scss","../../../resources/assets/sass/_emoji.scss","../../../resources/assets/sass/_mapbox.scss","../../../resources/assets/sass/_colors.scss","../../../resources/assets/sass/_styles.scss","../../../resources/assets/sass/_tags.scss"],"names":[],"mappings":"AAKA,KACI,8BAAsB,AAAtB,qBAAsB,CACzB,qBAKG,2BAAmB,AAAnB,kBAAmB,CACtB,KCVG,eACA,gCAAiC,CACpC,gBAGG,oBAAqB,CACxB,WCNG,oBACA,AADA,oBACA,AADA,aACA,8BACA,AADA,6BACA,AADA,kBACA,AADA,cACA,yBACA,AADA,sBACA,AADA,mBACA,WACA,eCJgB,CDKnB,cAGG,eACA,cAAe,CAClB,eAGG,cAAe,CAClB,KEdG,oBACA,AADA,oBACA,AADA,aACA,4BACA,AADA,6BACA,AADA,0BACA,AADA,sBACA,0BACA,AADA,uBACA,AADA,oBACA,gBACA,cACA,gBAAiB,CACpB,SAGG,cAAe,CAClB,WAIG,gBAAiB,CACpB,aCfG,iBAAkB,CACrB,qBAGG,iBAAkB,CACrB,2BAGG,WAAY,CACf,WAGG,kBACA,8BACA,AADA,6BACA,AADA,uBACA,AADA,mBACA,yBACA,AADA,sBACA,AADA,8BACA,sBACA,AADA,mBACA,AADA,qBACA,iBACA,YACA,WACA,UACA,WACA,uBACA,kBACA,2CACA,AADA,mCACA,YAAa,CAChB,8BAGG,oBAAa,AAAb,oBAAa,AAAb,YAAa,CAChB,0BAGG,WACA,WAAY,CACf,sBAGG,YAAa,CCnCjB,MACI,oBACA,AADA,oBACA,AADA,aACA,4BACA,AADA,6BACA,AADA,0BACA,AADA,sBACA,cAAe,CAClB,UAGG,eACA,eAAgB,CACnB,eAGG,oBACA,AADA,oBACA,AADA,aACA,8BACA,AADA,6BACA,AADA,uBACA,AADA,mBACA,yBAA8B,AAA9B,sBAA8B,AAA9B,6BAA8B,CACjC,MAGG,WACA,UAAW,CACd,YCtBG,oBACA,AADA,oBACA,AADA,aACA,8BACA,AADA,6BACA,AADA,uBACA,AADA,mBACA,8BACA,AADA,2BACA,AADA,6BACA,eACA,oBAAqB,CACxB,cCLG,eACA,oBACA,AADA,oBACA,AADA,aACA,8BACA,AADA,8BACA,AADA,+BACA,AADA,2BACA,yBACA,AADA,sBACA,AADA,8BACA,eAAgB,CACnB,kBAGG,WACA,WAAY,CACf,UCVG,cAAe,CAClB,gBCDG,gBACA,cACA,gBAAiB,CACpB,OAGG,gBACA,cACA,oBACA,AADA,oBACA,AADA,aACA,4BACA,AADA,6BACA,AADA,0BACA,AADA,sBACA,yBAAmB,AAAnB,sBAAmB,AAAnB,kBAAmB,CACtB,qDCVG,YAAa,CAChB,2BCAG,iBAAkB,CACrB,gFAIG,kBACA,cACA,UACA,aACA,OACA,cACA,qBACA,yBACA,oBACA,4CACA,AADA,oCACA,yBACA,kCACA,WACA,cACA,0CAAkC,AAAlC,iCAAkC,CACrC,2BAGG,KACI,aACA,6BACA,wCACA,0BACA,8BAAkC,AAAlC,qBAAkC,CAGtC,GACI,aACA,kCACA,yBACA,WACA,4CAAgD,AAAhD,mCAAgD,CAAA,CAIxD,AApBC,mBAGG,KACI,aACA,6BACA,wCACA,0BACA,8BAAkC,AAAlC,qBAAkC,CAGtC,GACI,aACA,kCACA,yBACA,WACA,4CAAgD,AAAhD,mCAAgD,CAAA,CAIxD,aACI,kCACI,kCAAmC,CACtC,CC9CL,KACI,YAAa,CAChB,oBAGG,kBAAmB,CACtB,QAGG,y4HACA,wBACA,WACA,WAAY,CACf,UAGG,kBACA,MACA,OACA,iBACA,cAAe,CAClB,gBAGG,gBACA,gBAAiB,CACpB,KCzBG,gCACA,kBAAmB,CACtB,WAGG,8BACA,kBAAmB,CACtB,YAIG,iBAAkB,CACrB,KCZG,oBAAqB,CACxB,aAGG,oBAAqB,CACxB,MCHG,SACA,gBACA,SAAU,CACb,SAGG,WACA,oBAAqB,CACxB,kBAIG,wBACA,0BACA,mBACA,qBACA,cACA,mBACA,sBACA,kBACA,qBACA,qBACA,8BAAsB,AAAtB,qBAAsB,CACzB,YAGG,0BACA,uCACA,oCACA,oCACA,WACA,kBACA,QACA,KAAM,CACT,WAGG,4BACA,kBAAmB,CACtB,kBAGG,4BAA6B,CAChC","file":"app.css"}
\ No newline at end of file
+{"version":3,"sources":["../../../resources/assets/sass/_border-box.scss","../../../resources/assets/sass/_base-font.scss","../../../resources/assets/sass/_header.scss","../../../resources/assets/sass/_variables.scss","../../../resources/assets/sass/_main.scss","../../../resources/assets/sass/_hovercard.scss","../../../resources/assets/sass/_notes.scss","../../../resources/assets/sass/_pagination.scss","../../../resources/assets/sass/_contacts-page.scss","../../../resources/assets/sass/_projects.scss","../../../resources/assets/sass/_footer.scss","../../../resources/assets/sass/_admin-form.scss","../../../resources/assets/sass/_form.scss","../../../resources/assets/sass/_bridgy-links.scss","../../../resources/assets/sass/_emoji.scss","../../../resources/assets/sass/_mapbox.scss","../../../resources/assets/sass/_colors.scss","../../../resources/assets/sass/_styles.scss","../../../resources/assets/sass/_tags.scss"],"names":[],"mappings":"AAKA,KACI,8BAAsB,AAAtB,qBAAsB,CACzB,qBAKG,2BAAmB,AAAnB,kBAAmB,CACtB,KCVG,eACA,gCAAiC,CACpC,gBAGG,oBAAqB,CACxB,WCNG,oBACA,AADA,oBACA,AADA,aACA,8BACA,AADA,6BACA,AADA,kBACA,AADA,cACA,yBACA,AADA,sBACA,AADA,mBACA,WACA,eCJgB,CDKnB,cAGG,eACA,cAAe,CAClB,eAGG,cAAe,CAClB,KEdG,oBACA,AADA,oBACA,AADA,aACA,4BACA,AADA,6BACA,AADA,0BACA,AADA,sBACA,0BACA,AADA,uBACA,AADA,oBACA,gBACA,cACA,iBACA,cAAe,CAClB,WAIG,gBAAiB,CACpB,aCZG,iBAAkB,CACrB,qBAGG,iBAAkB,CACrB,2BAGG,WAAY,CACf,WAGG,kBACA,8BACA,AADA,6BACA,AADA,uBACA,AADA,mBACA,yBACA,AADA,sBACA,AADA,8BACA,sBACA,AADA,mBACA,AADA,qBACA,iBACA,YACA,WACA,UACA,WACA,uBACA,kBACA,2CACA,AADA,mCACA,YAAa,CAChB,8BAGG,oBAAa,AAAb,oBAAa,AAAb,YAAa,CAChB,0BAGG,WACA,WAAY,CACf,sBAGG,YAAa,CCnCjB,MACI,oBACA,AADA,oBACA,AADA,aACA,4BACA,AADA,6BACA,AADA,0BACA,AADA,sBACA,cAAe,CAClB,UAGG,eACA,eAAgB,CACnB,eAGG,oBACA,AADA,oBACA,AADA,aACA,8BACA,AADA,6BACA,AADA,uBACA,AADA,mBACA,yBAA8B,AAA9B,sBAA8B,AAA9B,6BAA8B,CACjC,MAGG,WACA,UAAW,CACd,YCtBG,oBACA,AADA,oBACA,AADA,aACA,8BACA,AADA,6BACA,AADA,uBACA,AADA,mBACA,8BACA,AADA,2BACA,AADA,6BACA,eACA,oBAAqB,CACxB,cCLG,eACA,oBACA,AADA,oBACA,AADA,aACA,8BACA,AADA,8BACA,AADA,+BACA,AADA,2BACA,yBACA,AADA,sBACA,AADA,8BACA,eAAgB,CACnB,kBAGG,WACA,WAAY,CACf,UCVG,cAAe,CAClB,gBCDG,gBACA,cACA,gBAAiB,CACpB,OAGG,gBACA,cACA,oBACA,AADA,oBACA,AADA,aACA,4BACA,AADA,6BACA,AADA,0BACA,AADA,sBACA,yBAAmB,AAAnB,sBAAmB,AAAnB,kBAAmB,CACtB,YCXG,gBACA,kBAAmB,CACtB,MCFG,oBACA,AADA,oBACA,AADA,aACA,4BAAsB,AAAtB,6BAAsB,AAAtB,0BAAsB,AAAtB,qBAAsB,CACzB,UAGG,oBACA,AADA,oBACA,AADA,aACA,4BAAsB,AAAtB,6BAAsB,AAAtB,0BAAsB,AAAtB,qBAAsB,CACzB,aAGG,8BAAmB,AAAnB,6BAAmB,AAAnB,uBAAmB,AAAnB,kBAAmB,CACtB,qDCVG,YAAa,CAChB,2BCAG,iBAAkB,CACrB,gFAIG,kBACA,cACA,UACA,aACA,OACA,cACA,qBACA,yBACA,oBACA,4CACA,AADA,oCACA,yBACA,kCACA,WACA,cACA,0CAAkC,AAAlC,iCAAkC,CACrC,2BAGG,KACI,aACA,6BACA,wCACA,0BACA,8BAAkC,AAAlC,qBAAkC,CAGtC,GACI,aACA,kCACA,yBACA,WACA,4CAAgD,AAAhD,mCAAgD,CAAA,CAIxD,AApBC,mBAGG,KACI,aACA,6BACA,wCACA,0BACA,8BAAkC,AAAlC,qBAAkC,CAGtC,GACI,aACA,kCACA,yBACA,WACA,4CAAgD,AAAhD,mCAAgD,CAAA,CAIxD,aACI,kCACI,kCAAmC,CACtC,CC9CL,KACI,YAAa,CAChB,oBAGG,kBAAmB,CACtB,QAGG,y4HACA,wBACA,WACA,WAAY,CACf,UAGG,kBACA,MACA,OACA,iBACA,cAAe,CAClB,gBAGG,gBACA,gBAAiB,CACpB,KCzBG,gCACA,kBAAmB,CACtB,WAGG,8BACA,kBAAmB,CACtB,YAIG,iBAAkB,CACrB,KCZG,oBAAqB,CACxB,aAGG,oBAAqB,CACxB,MCHG,SACA,gBACA,SAAU,CACb,SAGG,WACA,oBAAqB,CACxB,kBAIG,wBACA,0BACA,mBACA,qBACA,cACA,mBACA,sBACA,kBACA,qBACA,qBACA,8BAAsB,AAAtB,qBAAsB,CACzB,YAGG,0BACA,uCACA,oCACA,oCACA,WACA,kBACA,QACA,KAAM,CACT,WAGG,4BACA,kBAAmB,CACtB,kBAGG,4BAA6B,CAChC","file":"app.css"}
\ No newline at end of file
diff --git a/resources/assets/sass/_admin-form.scss b/resources/assets/sass/_admin-form.scss
new file mode 100644
index 00000000..beb5d813
--- /dev/null
+++ b/resources/assets/sass/_admin-form.scss
@@ -0,0 +1,6 @@
+//admin-form.scss
+
+.admin-form {
+    margin-top: 2rem;
+    margin-bottom: 2rem;
+}
diff --git a/resources/assets/sass/_form.scss b/resources/assets/sass/_form.scss
new file mode 100644
index 00000000..09a06592
--- /dev/null
+++ b/resources/assets/sass/_form.scss
@@ -0,0 +1,15 @@
+//form.scss
+
+.form {
+    display: flex;
+    flex-direction: column;
+}
+
+.form > div {
+    display: flex;
+    flex-direction: column;
+}
+
+div.form-row {
+    flex-direction: row;
+}
diff --git a/resources/assets/sass/_main.scss b/resources/assets/sass/_main.scss
index c66c1301..5beededf 100644
--- a/resources/assets/sass/_main.scss
+++ b/resources/assets/sass/_main.scss
@@ -7,9 +7,6 @@ main {
     max-width: $body-width;
     margin: 0 auto;
     padding: 0 0.5rem;
-}
-
-.h-entry {
     font-size: 2rem;
 }
 
diff --git a/resources/assets/sass/app.scss b/resources/assets/sass/app.scss
index b80c1414..45b97335 100644
--- a/resources/assets/sass/app.scss
+++ b/resources/assets/sass/app.scss
@@ -16,6 +16,8 @@
 @import "contacts-page";
 @import "projects";
 @import "footer";
+@import "admin-form";
+@import "form";
 
 //hide the custom bridgy posse content
 @import "bridgy-links";
diff --git a/resources/views/admin/articles/create.blade.php b/resources/views/admin/articles/create.blade.php
index 557eca1f..f140666c 100644
--- a/resources/views/admin/articles/create.blade.php
+++ b/resources/views/admin/articles/create.blade.php
@@ -4,22 +4,27 @@
 
 @section('content')
 @if(isset($message))            <p class="error">{{ $message }}</p>@endif
-            <form action="/admin/blog/" method="post" accept-charset="utf-8" enctype="multipart/form-data" id="newarticle">
+            <form action="/admin/blog/" method="post" accept-charset="utf-8" enctype="multipart/form-data" class="admin-form form">
                 {{ csrf_field() }}
-                <label for="title">Title (URL):</label>
-                <br>
-                <input type="text" name="title" id="title" value="{{ old('title') }}" placeholder="Title here">
-                <br>
-                <input type="text" name="url" id="url" value="{{ old('url') }}" placeholder="Article URL">
-                <br>
-                <label for="main">Main:</label>
-                <br>
-                <textarea name="main" id="main" placeholder="Article here">{{ old('main') }}</textarea>
-                <br>
-                <label for="published">Published:</label><input type="checkbox" name="published" id="published" value="1">
-                <br>
-                <p>Or you can upload an <code>.md</code> file:</p><input type="file" accept=".md" name="article">
-                <br>
-                <button type="submit" name="save">Save</button>
+                <div>
+                    <label for="title">Title (URL):</label>
+                    <input type="text" name="title" id="title" value="{{ old('title') }}" placeholder="Title here">
+                    <input type="text" name="url" id="url" value="{{ old('url') }}" placeholder="Article URL">
+                </div>
+                <div>
+                    <label for="main">Main:</label>
+                    <textarea name="main" id="main" placeholder="Article here">{{ old('main') }}</textarea>
+                </div>
+                <div class="form-row">
+                    <label for="published">Published:</label>
+                    <input type="checkbox" name="published" id="published" value="1">
+                </div>
+                <p>Or you can upload an <code>.md</code> file:</p>
+                <div>
+                    <input type="file" accept=".md" name="article">
+                </div>
+                <div>
+                    <button type="submit" name="save">Save</button>
+                </div>
             </form>
 @stop
diff --git a/resources/views/admin/articles/edit.blade.php b/resources/views/admin/articles/edit.blade.php
index a482aabd..43072826 100644
--- a/resources/views/admin/articles/edit.blade.php
+++ b/resources/views/admin/articles/edit.blade.php
@@ -3,29 +3,32 @@
 @section('title')Edit Article « Admin CP « @stop
 
 @section('content')
-            <form action="/admin/blog/{{ $id }}" method="post" accept-charset="utf-8">
+            <form action="/admin/blog/{{ $id }}" method="post" accept-charset="utf-8" class="admin-form form">
                 {{ csrf_field() }}
                 {{ method_field('PUT') }}
-                <label for="title">Title (URL):</label>
-                <br>
-                <input type="text" name="title" id="title" value="{!! $post['0']['title'] !!}">
-                <br>
-                <input type="url" name="url" id="url" value="{!! $post['0']['url'] !!}">
-                <br>
-                <label for="main">Main:</label>
-                <br>
-                <textarea name="main" id="main">{{ $post['0']['main'] }}</textarea>
-                <br>
-                <label for="published">Published:</label><input type="checkbox" name="published" value="1"@if($post['0']['published'] == '1') checked="checked"@endif>
-                <br>
-                <input type="submit" name="save" value="Save">
+                <div>
+                    <label for="title">Title (URL):</label>
+                    <input type="text" name="title" id="title" value="{!! $post['0']['title'] !!}">
+                    <input type="url" name="url" id="url" value="{!! $post['0']['url'] !!}">
+                </div>
+                <div>
+                    <label for="main">Main:</label>
+                    <textarea name="main" id="main">{{ $post['0']['main'] }}</textarea>
+                </div>
+                <div class="form-row">
+                    <label for="published">Published:</label>
+                    <input type="checkbox" name="published" value="1"@if($post['0']['published'] == '1') checked="checked"@endif>
+                </div>
+                <div>
+                    <button type="submit" name="save">Save</button>
+                </div>
             </form>
             <hr>
-            <form action="/admin/blog/{{ $id }}" method="post">
+            <form action="/admin/blog/{{ $id }}" method="post" class="admin-form form">
                 {{ csrf_field() }}
                 {{ method_field('DELETE') }}
-                <button type="submit" name="submit">
-                    Delete
-                </button>
+                <div>
+                    <button type="submit" name="delete">Delete</button>
+                </div>
             </form>
 @stop
diff --git a/resources/views/admin/clients/create.blade.php b/resources/views/admin/clients/create.blade.php
index f505516c..7d1feff6 100644
--- a/resources/views/admin/clients/create.blade.php
+++ b/resources/views/admin/clients/create.blade.php
@@ -4,10 +4,18 @@
 
 @section('content')
             <h1>New Client</h1>
-            <form action="/admin/clients/" method="post" accept-charset="utf-8">
+            <form action="/admin/clients/" method="post" accept-charset="utf-8" class="admin-form form">
                 {{ csrf_field() }}
-                <input type="text" name="client_url" id="client_url" placeholder="client_url"><br>
-                <input type="text" name="client_name" id="client_name" placeholder="client_name"><br>
-                <input type="submit" name="submit" value="Submit">
+                <div>
+                    <label for="client_url">Client URL:</label>
+                    <input type="text" name="client_url" id="client_url" placeholder="client_url">
+                </div>
+                <div>
+                    <label for="client_name">Client Name:</label>
+                    <input type="text" name="client_name" id="client_name" placeholder="client_name">
+                </div>
+                <div>
+                    <button type="submit" name="submit">Submit</button>
+                </div>
             </form>
 @stop
diff --git a/resources/views/admin/clients/edit.blade.php b/resources/views/admin/clients/edit.blade.php
index 29305180..8c2b0835 100644
--- a/resources/views/admin/clients/edit.blade.php
+++ b/resources/views/admin/clients/edit.blade.php
@@ -4,17 +4,25 @@
 
 @section('content')
             <h1>Edit Client</h1>
-                <form action="/admin/clients/{{ $id }}" method="post" accept-charset="utf-8">
+            <form action="/admin/clients/{{ $id }}" method="post" accept-charset="utf-8" class="admin-form form">
                 {{ csrf_field() }}
                 {{ method_field('PUT') }}
-                <input type="text" name="client_url" id="client_url" value="{{ $client_url }}"><br>
-                <input type="text" name="client_name" id="client_name" value="{{ $client_name }}"><br>
-                <input type="submit" name="submit" value="Edit">
+                <div>
+                    <label for="client_url">Client URL:</label>
+                    <input type="text" name="client_url" id="client_url" value="{{ $client_url }}">
+                </div>
+                <div>
+                    <label for="client_name">Client Name:</label>
+                    <input type="text" name="client_name" id="client_name" value="{{ $client_name }}">
+                </div>
+                <div>
+                    <button type="submit" name="edit">Edit</button>
+                </div>
             </form>
             <hr>
             <form action="/admin/clients/{{ $id }}" method="post">
                 {{ csrf_field() }}
                 {{ method_field('DELETE') }}
-                <button type="submit">Delete Client</button>
+                <button type="submit" name="delete">Delete Client</button>
             </form>
 @stop
diff --git a/resources/views/admin/contacts/create.blade.php b/resources/views/admin/contacts/create.blade.php
index cfb22a56..36f8665d 100644
--- a/resources/views/admin/contacts/create.blade.php
+++ b/resources/views/admin/contacts/create.blade.php
@@ -4,12 +4,26 @@
 
 @section('content')
             <h1>New Contact</h1>
-            <form action="/admin/contacts/" method="post" accept-charset="utf-8">
+            <form action="/admin/contacts/" method="post" accept-charset="utf-8" class="admin-form form">
                 {{ csrf_field() }}
-                <label for="name">Real Name:</label> <input type="text" name="name" id="name" placeholder="Real Name"><br>
-                <label for="nick">Nick:</label> <input type="text" name="nick" id="nick" placeholder="local_nick"><br>
-                <label for="homepage">Homepage:</label> <input type="text" name="homepage" id="homepage" placeholder="https://homepage.com"><br>
-                <label for="twitter">Twitter Nick:</label> <input type="text" name="twitter" id="twitter" placeholder="Twitter handle"><br>
-                <input type="submit" name="submit" value="Submit">
+                <div>
+                    <label for="name">Real Name:</label>
+                    <input type="text" name="name" id="name" placeholder="Real Name">
+                </div>
+                <div>
+                    <label for="nick">Nick:</label>
+                    <input type="text" name="nick" id="nick" placeholder="local_nick">
+                </div>
+                <div>
+                    <label for="homepage">Homepage:</label>
+                    <input type="text" name="homepage" id="homepage" placeholder="https://homepage.com">
+                </div>
+                <div>
+                    <label for="twitter">Twitter Nick:</label>
+                    <input type="text" name="twitter" id="twitter" placeholder="Twitter handle">
+                </div>
+                <div>
+                    <button type="submit" name="submit">Submit</button>
+                </div>
             </form>
 @stop
diff --git a/resources/views/admin/contacts/edit.blade.php b/resources/views/admin/contacts/edit.blade.php
index b5181c1c..c74ef4f9 100644
--- a/resources/views/admin/contacts/edit.blade.php
+++ b/resources/views/admin/contacts/edit.blade.php
@@ -4,37 +4,36 @@
 
 @section('content')
             <h1>Edit Contact</h1>
-            <form action="/admin/contacts/{{ $contact->id }}" method="post" enctype="multipart/form-data" accept-charset="utf-8">
+            <form action="/admin/contacts/{{ $contact->id }}" method="post" enctype="multipart/form-data" accept-charset="utf-8" class="admin-form form">
                 {{ csrf_field() }}
                 {{ method_field('PUT') }}
-                <fieldset class="note-ui">
-                    <legend>Conctact</legend>
-                    <div>
-                        <label for="name">Real Name:</label>
-                        <input type="text" name="name" id="name" placeholder="Real Name" value="{{ $contact->name }}">
-                    </div>
-                    <div>
-                        <label for="nick">Nick:</label>
-                        <input type="text" name="nick" id="nick" placeholder="local_nick" value="{{ $contact->nick }}">
-                    </div>
-                    <div>
-                        <label for="homepage">Website:</label>
-                        <input type="text" name="homepage" id="homepage" placeholder="https://homepage.com" value="{{ $contact->homepage }}">
-                    </div>
-                    <div>
-                        <label for="twitter">Twitter Nick:</label>
-                        <input type="text" name="twitter" id="twitter" placeholder="Twitter handle" value="{{ $contact->twitter }}">
-                    </div>
-                    <div>
-                        <label for="facebook">Facebook Profile ID:</label>
-                        <input type="text" name="facebook" id="facebook" placeholder="Facebook ID" value="{{ $contact->facebook }}">
-                    </div>
-                    <div>
-                        <label for="avatar">Avatar:</label>
-                        <input type="file" accept="image/*" value="Upload" name="avatar" id="avatar">
-                    </div>
-                    <input type="submit" name="submit" value="Submit">
-                </fieldset>
+                <div>
+                    <label for="name">Real Name:</label>
+                    <input type="text" name="name" id="name" placeholder="Real Name" value="{{ $contact->name }}">
+                </div>
+                <div>
+                    <label for="nick">Nick:</label>
+                    <input type="text" name="nick" id="nick" placeholder="local_nick" value="{{ $contact->nick }}">
+                </div>
+                <div>
+                    <label for="homepage">Website:</label>
+                    <input type="text" name="homepage" id="homepage" placeholder="https://homepage.com" value="{{ $contact->homepage }}">
+                </div>
+                <div>
+                    <label for="twitter">Twitter Nick:</label>
+                    <input type="text" name="twitter" id="twitter" placeholder="Twitter handle" value="{{ $contact->twitter }}">
+                </div>
+                <div>
+                    <label for="facebook">Facebook Profile ID:</label>
+                    <input type="text" name="facebook" id="facebook" placeholder="Facebook ID" value="{{ $contact->facebook }}">
+                </div>
+                <div>
+                    <label for="avatar">Avatar:</label>
+                    <input type="file" accept="image/*" value="Upload" name="avatar" id="avatar">
+                </div>
+                <div>
+                    <button type="submit" name="submit">Submit</button>
+                </div>
             </form>
             <p>Instead of uploading an image, you can <a href="/admin/contacts/edit/{{ $contact->id }}/getavatar">grab from their homepage</a>?</p>
 @stop
diff --git a/resources/views/admin/notes/create.blade.php b/resources/views/admin/notes/create.blade.php
index 72ad0566..6fc628bb 100644
--- a/resources/views/admin/notes/create.blade.php
+++ b/resources/views/admin/notes/create.blade.php
@@ -12,35 +12,28 @@
                 </ul>
             </div>
 @endif
-            <form action="/admin/notes" method="post" accept-charset="utf-8">
+            <form action="/admin/notes" method="post" accept-charset="utf-8" class="admin-form form">
                 {{ csrf_field() }}
-                <fieldset>
-                    <legend>New Note</legend>
-                    <div>
-                        <label for="in-reply-to" accesskey="r">Reply-to: </label>
-                        <input type="text"
-                               name="in-reply-to"
-                               id="in-reply-to"
-                               placeholder="in-reply-to-1 in-reply-to-2 …"
-                        >
-                    </div>
-                    <div>
-                        <label for="content" accesskey="n">Note: </label>
-                        <textarea name="content"
-                                  id="content"
-                                  placeholder="Note"
-                                  autofocus="autofocus">
-                            {{ old('content') }}
-                        </textarea>
-                    </div>
-                    <div>
-                    <div>
-                        <button type="submit"
-                                name="submit"
-                                id="submit"
-                                value="Submit"
-                        >Submit</button>
-                    </div>
-                </fieldset>
+                <div>
+                    <label for="in-reply-to" accesskey="r">Reply-to: </label>
+                    <input type="text"
+                           name="in-reply-to"
+                           id="in-reply-to"
+                           placeholder="in-reply-to-1 in-reply-to-2 …"
+                    >
+                </div>
+                <div>
+                    <label for="content" accesskey="n">Note: </label>
+                    <textarea name="content"
+                              id="content"
+                              placeholder="Note"
+                              autofocus="autofocus"
+                    >{{ old('content') }}</textarea>
+                </div>
+                <div>
+                    <button type="submit"
+                            name="submit"
+                    >Submit</button>
+                </div>
             </form>
 @stop
diff --git a/resources/views/admin/notes/edit.blade.php b/resources/views/admin/notes/edit.blade.php
index 4bbf8662..9530dd2f 100644
--- a/resources/views/admin/notes/edit.blade.php
+++ b/resources/views/admin/notes/edit.blade.php
@@ -3,23 +3,31 @@
 @section('title')Edit Note « Admin CP « @stop
 
 @section('content')
-            <form action="/admin/notes/{{ $note->id }}" method="post" accept-charset="utf-8">
+            <form action="/admin/notes/{{ $note->id }}" method="post" accept-charset="utf-8" class="admin-form form">
                 {{ csrf_field() }}
                 {{ method_field('PUT') }}
-                <fieldset>
-                    <legend>Edit Note</legend>
-                    <label for="in-reply-to" accesskey="r">Reply-to: </label><input type="text" name="in-reply-to" id="in-reply-to" placeholder="in-reply-to-1 in-reply-to-2 …" tabindex="1" value="{{ $note->in_reply_to }}"><br>
-                    <label for="content" accesskey="n">Note: </label><textarea name="content" id="content" placeholder="Note" tabindex="2">{{ $note->originalNote }}</textarea><br>
-                    <label for="webmentions" accesskey="w">Send webmentions: </label><input type="checkbox" name="webmentions" id="webmentions" checked="checked" tabindex="3"><br>
-                    <label for="kludge"></label><input type="submit" value="Submit" id="kludge" tabindex="6">
-                </fieldset>
+                <div>
+                    <label for="in-reply-to" accesskey="r">Reply-to: </label>
+                    <input type="text" name="in-reply-to" id="in-reply-to" placeholder="in-reply-to-1 in-reply-to-2 …" tabindex="1" value="{{ $note->in_reply_to }}">
+                </div>
+                <div>
+                    <label for="content" accesskey="n">Note: </label>
+                    <textarea name="content" id="content" placeholder="Note" tabindex="2">{{ $note->originalNote }}</textarea>
+                </div>
+                <div class="form-row">
+                    <label for="webmentions" accesskey="w">Send webmentions: </label>
+                    <input type="checkbox" name="webmentions" id="webmentions" checked="checked" tabindex="3">
+                </div>
+                <div>
+                    <button type="submit" name="submit">Submit</button>
+                </div>
             </form>
-            <form action="/admin/notes/{{ $note->id }}" method="post" accept-charset="utf-8">
+            <hr>
+            <form action="/admin/notes/{{ $note->id }}" method="post" accept-charset="utf-8" class="form">
                 {{ csrf_field() }}
                 {{ method_field('DELETE') }}
-                <fieldset>
-                    <legend>Delete Note</legend>
-                    <label for="kludge"></label><input type="submit" value="Delete" id="kludge">
-                </fieldset>
+                <div>
+                    <button type="submit" name="delete">Delete</button>
+                </div>
             </form>
 @stop
diff --git a/resources/views/admin/places/create.blade.php b/resources/views/admin/places/create.blade.php
index a59bb80d..a9c625e3 100644
--- a/resources/views/admin/places/create.blade.php
+++ b/resources/views/admin/places/create.blade.php
@@ -4,15 +4,31 @@
 
 @section('content')
             <h1>New Place</h1>
-            <form action="/admin/places/" method="post" accept-charset="utf-8">
+            <form action="/admin/places/" method="post" accept-charset="utf-8" class="admin-form form">
                 {{ csrf_field() }}
-                <label for="name">Name:</label> <input type="text" name="name" id="name" placeholder="Place Name"><br>
-                <label for="description">Description:</label> <input type="text" name="description" id="description" placeholder="Description"><br>
-                <label for="latitude">Latitude:</label> <input type="text" name="latitude" id="latitude" placeholder="Latitude"><br>
-                <label for="longitude">Longitude:</label> <input type="text" name="longitude" id="longitude" placeholder="Longitude"><br>
-                <input type="submit" name="submit" value="Submit">
+                <div>
+                    <label for="name">Name:</label>
+                    <input type="text" name="name" id="name" placeholder="Place Name">
+                </div>
+                <div>
+                    <label for="description">Description:</label>
+                    <input type="text" name="description" id="description" placeholder="Description">
+                </div>
+                <div>
+                    <label for="latitude">Latitude:</label>
+                    <input type="text" name="latitude" id="latitude" placeholder="Latitude">
+                </div>
+                <div>
+                    <label for="longitude">Longitude:</label>
+                    <input type="text" name="longitude" id="longitude" placeholder="Longitude">
+                </div>
+                <div>
+                    <input type="submit" name="submit" value="Submit">
+                </div>
                 <h2>Location</h2>
-                <button type="button" name="locate" id="locate">Locate</button>
+                <div>
+                    <button type="button" name="locate" id="locate">Locate</button>
+                </div>
             </form>
 @stop
 
diff --git a/resources/views/admin/places/edit.blade.php b/resources/views/admin/places/edit.blade.php
index d86cf16f..301a797e 100644
--- a/resources/views/admin/places/edit.blade.php
+++ b/resources/views/admin/places/edit.blade.php
@@ -4,118 +4,137 @@
 
 @section('content')
             <h1>Edit Place</h1>
-            <form action="/admin/places/{{ $place->id }}" method="post" accept-charset="utf-8">
+            <form action="/admin/places/{{ $place->id }}" method="post" accept-charset="utf-8" class="admin-form form">
                 {{ csrf_field() }}
                 {{ method_field('PUT') }}
-                <p>Name</p>
-                <input type="text" name="name" id="name" value="{{ $place->name }}"><br>
-                <p>Description</p>
-                <textarea name="description" id="description">{{ $place->description }}</textarea><br>
-                <p>Location</p>
-                <div class="map" data-latitude="{{ $place->latitude }}" data-longitude="{{ $place->longitude }}" data-id="{{ $place->id }}"></div>
-                <script>
-                    var geojson{{ $place->id }} = {
-                        "type": "FeatureCollection",
-                        "features": [{
-                            "type": "Feature",
-                            "geometry": {
-                                "type": "Point",
-                                "coordinates": [{{ $place->longitude }}, {{ $place->latitude }}]
-                            },
-                            "properties": {
-                                "title": "{{ $place->name }}",
-                                "icon": "{{ $place->icon ?? 'marker' }}"
-                            }
-                        }]
-                    }
-                </script>
-                <input type="text" name="latitude" id="latitude" value="{{ $place->latitude }}"><br>
-                <input type="text" name="longitude" id="longitude" value="{{ $place->longitude }}"><br>
-                <p>Map Icon</p>
-                <select name="icon" id="icon">
-                    <option value="airfield"@if($place->icon == 'airfield')selected @endif>airfield</option>
-                    <option value="airport"@if($place->icon == 'airport')selected @endif>airport</option>
-                    <option value="alcohol-shop"@if($place->icon == 'alcohol-shop')selected @endif>alcohol-shop</option>
-                    <option value="amusement-park"@if($place->icon == 'amusement-park')selected @endif>amusement-park</option>
-                    <option value="aquarium"@if($place->icon == 'aquarium')selected @endif>aquarium</option>
-                    <option value="art-gallery"@if($place->icon == 'art-gallery')selected @endif>art-gallery</option>
-                    <option value="attraction"@if($place->icon == 'attraction')selected @endif>attraction</option>
-                    <option value="bakery"@if($place->icon == 'bakery')selected @endif>bakery</option>
-                    <option value="bank"@if($place->icon == 'bank')selected @endif>bank</option>
-                    <option value="bar"@if($place->icon == 'bar')selected @endif>bar</option>
-                    <option value="beer"@if($place->icon == 'beer')selected @endif>beer</option>
-                    <option value="bicycle"@if($place->icon == 'bicycle')selected @endif>bicycle</option>
-                    <option value="bicycle-share"@if($place->icon == 'bicycle-share')selected @endif>bicycle-share</option>
-                    <option value="bus"@if($place->icon == 'bus')selected @endif>bus</option>
-                    <option value="cafe"@if($place->icon == 'cafe')selected @endif>cafe</option>
-                    <option value="campsite"@if($place->icon == 'campsite')selected @endif>campsite</option>
-                    <option value="car"@if($place->icon == 'car')selected @endif>car</option>
-                    <option value="castle"@if($place->icon == 'castle')selected @endif>castle</option>
-                    <option value="cemetery"@if($place->icon == 'cemetery')selected @endif>cemetery</option>
-                    <option value="cinema"@if($place->icon == 'cinema')selected @endif>cinema</option>
-                    <option value="circle"@if($place->icon == 'circle')selected @endif>circle</option>
-                    <option value="circle-stroked"@if($place->icon == 'circle-stroked')selected @endif>circle-stroked</option>
-                    <option value="clothing-store"@if($place->icon == 'clothing-store')selected @endif>clothing-store</option>
-                    <option value="college"@if($place->icon == 'college')selected @endif>college</option>
-                    <option value="dentist"@if($place->icon == 'dentist')selected @endif>dentist</option>
-                    <option value="doctor"@if($place->icon == 'doctor')selected @endif>doctor</option>
-                    <option value="dog-park"@if($place->icon == 'dog-park')selected @endif>dog-park</option>
-                    <option value="drinking-water"@if($place->icon == 'drinking-water')selected @endif>drinking-water</option>
-                    <option value="embassy"@if($place->icon == 'embassy')selected @endif>embassy</option>
-                    <option value="entrance"@if($place->icon == 'entrance')selected @endif>entrance</option>
-                    <option value="fast-food"@if($place->icon == 'fast-food')selected @endif>fast-food</option>
-                    <option value="ferry"@if($place->icon == 'ferry')selected @endif>ferry</option>
-                    <option value="fire-station"@if($place->icon == 'fire-station')selected @endif>fire-station</option>
-                    <option value="fuel"@if($place->icon == 'fuel')selected @endif>fuel</option>
-                    <option value="garden"@if($place->icon == 'garden')selected @endif>garden</option>
-                    <option value="golf"@if($place->icon == 'golf')selected @endif>golf</option>
-                    <option value="grocery"@if($place->icon == 'grocery')selected @endif>grocery</option>
-                    <option value="harbor"@if($place->icon == 'harbor')selected @endif>harbor</option>
-                    <option value="heliport"@if($place->icon == 'heliport')selected @endif>heliport</option>
-                    <option value="hospital"@if($place->icon == 'hospital')selected @endif>hospital</option>
-                    <option value="ice-cream"@if($place->icon == 'ice-cream')selected @endif>ice-cream</option>
-                    <option value="information"@if($place->icon == 'information')selected @endif>information</option>
-                    <option value="laundry"@if($place->icon == 'laundry')selected @endif>laundry</option>
-                    <option value="library"@if($place->icon == 'library')selected @endif>library</option>
-                    <option value="lodging"@if($place->icon == 'lodging')selected @endif>lodging</option>
-                    <option value="marker"@if($place->icon == 'marker')selected @endif>marker</option>
-                    <option value="monument"@if($place->icon == 'monument')selected @endif>monument</option>
-                    <option value="mountain"@if($place->icon == 'mountain')selected @endif>mountain</option>
-                    <option value="museum"@if($place->icon == 'museum')selected @endif>museum</option>
-                    <option value="music"@if($place->icon == 'music')selected @endif>music</option>
-                    <option value="park"@if($place->icon == 'park')selected @endif>park</option>
-                    <option value="pharmacy"@if($place->icon == 'pharmacy')selected @endif>pharmacy</option>
-                    <option value="picnic-site"@if($place->icon == 'picnic-site')selected @endif>picnic-site</option>
-                    <option value="place-of-worship"@if($place->icon == 'place-of-worship')selected @endif>place-of-worship</option>
-                    <option value="playground"@if($place->icon == 'playground')selected @endif>playground</option>
-                    <option value="police"@if($place->icon == 'police')selected @endif>police</option>
-                    <option value="post"@if($place->icon == 'post')selected @endif>post</option>
-                    <option value="prison"@if($place->icon == 'prison')selected @endif>prison</option>
-                    <option value="rail"@if($place->icon == 'rail')selected @endif>rail</option>
-                    <option value="rail-light"@if($place->icon == 'rail-light')selected @endif>rail-light</option>
-                    <option value="rail-metro"@if($place->icon == 'rail-metro')selected @endif>rail-metro</option>
-                    <option value="religious-christian"@if($place->icon == 'religious-christian')selected @endif>religious-christian</option>
-                    <option value="religious-jewish"@if($place->icon == 'religious-jewish')selected @endif>religious-jewish</option>
-                    <option value="religious-muslim"@if($place->icon == 'religious-muslim')selected @endif>religious-muslim</option>
-                    <option value="restaurant"@if($place->icon == 'restaurant')selected @endif>restaurant</option>
-                    <option value="rocket"@if($place->icon == 'rocket')selected @endif>rocket</option>
-                    <option value="school"@if($place->icon == 'school')selected @endif>school</option>
-                    <option value="shop"@if($place->icon == 'shop')selected @endif>shop</option>
-                    <option value="stadium"@if($place->icon == 'stadium')selected @endif>stadium</option>
-                    <option value="star"@if($place->icon == 'star')selected @endif>star</option>
-                    <option value="suitcase"@if($place->icon == 'suitcase')selected @endif>suitcase</option>
-                    <option value="swimming"@if($place->icon == 'swimming')selected @endif>swimming</option>
-                    <option value="theatre"@if($place->icon == 'theatre')selected @endif>theatre</option>
-                    <option value="toilet"@if($place->icon == 'toilet')selected @endif>toilet</option>
-                    <option value="town-hall"@if($place->icon == 'town-hall')selected @endif>town-hall</option>
-                    <option value="triangle"@if($place->icon == 'triangle')selected @endif>triangle</option>
-                    <option value="triangle-stroked"@if($place->icon == 'triangle-stroked')selected @endif>triangle-stroked</option>
-                    <option value="veterinary"@if($place->icon == 'veterinary')selected @endif>veterinary</option>
-                    <option value="volcano"@if($place->icon == 'volcano')selected @endif>volcano</option>
-                    <option value="zoo"@if($place->icon == 'zoo')selected @endif>zoo</option>
-                </select><br>
-                <input type="submit" name="edit" value="Edit"><br><br>
-                <input type="submit" name="delete" value="Delete">
+                <div>
+                    <label for="name">Name:</label>
+                    <input type="text" name="name" id="name" value="{{ $place->name }}">
+                </div>
+                <div>
+                    <label for="description">Description</label>
+                    <textarea name="description" id="description">{{ $place->description }}</textarea>
+                </div>
+                <div>
+                    <p>Location</p>
+                    <div class="map" data-latitude="{{ $place->latitude }}" data-longitude="{{ $place->longitude }}" data-id="{{ $place->id }}"></div>
+                    <script>
+                        var geojson{{ $place->id }} = {
+                            "type": "FeatureCollection",
+                            "features": [{
+                                "type": "Feature",
+                                "geometry": {
+                                    "type": "Point",
+                                    "coordinates": [{{ $place->longitude }}, {{ $place->latitude }}]
+                                },
+                                "properties": {
+                                    "title": "{{ $place->name }}",
+                                    "icon": "{{ $place->icon ?? 'marker' }}"
+                                }
+                            }]
+                        }
+                    </script>
+                </div>
+                <div>
+                    <label for="latitude">Latitude:</label>
+                    <input type="text" name="latitude" id="latitude" value="{{ $place->latitude }}">
+                </div>
+                <div>
+                    <label for="longitude">Longitude:</label>
+                    <input type="text" name="longitude" id="longitude" value="{{ $place->longitude }}">
+                </div>
+                <div class="form-row">
+                    <label for="icon">Map Icon</label>
+                    <select name="icon" id="icon">
+                        <option value="airfield"@if($place->icon == 'airfield')selected @endif>airfield</option>
+                        <option value="airport"@if($place->icon == 'airport')selected @endif>airport</option>
+                        <option value="alcohol-shop"@if($place->icon == 'alcohol-shop')selected @endif>alcohol-shop</option>
+                        <option value="amusement-park"@if($place->icon == 'amusement-park')selected @endif>amusement-park</option>
+                        <option value="aquarium"@if($place->icon == 'aquarium')selected @endif>aquarium</option>
+                        <option value="art-gallery"@if($place->icon == 'art-gallery')selected @endif>art-gallery</option>
+                        <option value="attraction"@if($place->icon == 'attraction')selected @endif>attraction</option>
+                        <option value="bakery"@if($place->icon == 'bakery')selected @endif>bakery</option>
+                        <option value="bank"@if($place->icon == 'bank')selected @endif>bank</option>
+                        <option value="bar"@if($place->icon == 'bar')selected @endif>bar</option>
+                        <option value="beer"@if($place->icon == 'beer')selected @endif>beer</option>
+                        <option value="bicycle"@if($place->icon == 'bicycle')selected @endif>bicycle</option>
+                        <option value="bicycle-share"@if($place->icon == 'bicycle-share')selected @endif>bicycle-share</option>
+                        <option value="bus"@if($place->icon == 'bus')selected @endif>bus</option>
+                        <option value="cafe"@if($place->icon == 'cafe')selected @endif>cafe</option>
+                        <option value="campsite"@if($place->icon == 'campsite')selected @endif>campsite</option>
+                        <option value="car"@if($place->icon == 'car')selected @endif>car</option>
+                        <option value="castle"@if($place->icon == 'castle')selected @endif>castle</option>
+                        <option value="cemetery"@if($place->icon == 'cemetery')selected @endif>cemetery</option>
+                        <option value="cinema"@if($place->icon == 'cinema')selected @endif>cinema</option>
+                        <option value="circle"@if($place->icon == 'circle')selected @endif>circle</option>
+                        <option value="circle-stroked"@if($place->icon == 'circle-stroked')selected @endif>circle-stroked</option>
+                        <option value="clothing-store"@if($place->icon == 'clothing-store')selected @endif>clothing-store</option>
+                        <option value="college"@if($place->icon == 'college')selected @endif>college</option>
+                        <option value="dentist"@if($place->icon == 'dentist')selected @endif>dentist</option>
+                        <option value="doctor"@if($place->icon == 'doctor')selected @endif>doctor</option>
+                        <option value="dog-park"@if($place->icon == 'dog-park')selected @endif>dog-park</option>
+                        <option value="drinking-water"@if($place->icon == 'drinking-water')selected @endif>drinking-water</option>
+                        <option value="embassy"@if($place->icon == 'embassy')selected @endif>embassy</option>
+                        <option value="entrance"@if($place->icon == 'entrance')selected @endif>entrance</option>
+                        <option value="fast-food"@if($place->icon == 'fast-food')selected @endif>fast-food</option>
+                        <option value="ferry"@if($place->icon == 'ferry')selected @endif>ferry</option>
+                        <option value="fire-station"@if($place->icon == 'fire-station')selected @endif>fire-station</option>
+                        <option value="fuel"@if($place->icon == 'fuel')selected @endif>fuel</option>
+                        <option value="garden"@if($place->icon == 'garden')selected @endif>garden</option>
+                        <option value="golf"@if($place->icon == 'golf')selected @endif>golf</option>
+                        <option value="grocery"@if($place->icon == 'grocery')selected @endif>grocery</option>
+                        <option value="harbor"@if($place->icon == 'harbor')selected @endif>harbor</option>
+                        <option value="heliport"@if($place->icon == 'heliport')selected @endif>heliport</option>
+                        <option value="hospital"@if($place->icon == 'hospital')selected @endif>hospital</option>
+                        <option value="ice-cream"@if($place->icon == 'ice-cream')selected @endif>ice-cream</option>
+                        <option value="information"@if($place->icon == 'information')selected @endif>information</option>
+                        <option value="laundry"@if($place->icon == 'laundry')selected @endif>laundry</option>
+                        <option value="library"@if($place->icon == 'library')selected @endif>library</option>
+                        <option value="lodging"@if($place->icon == 'lodging')selected @endif>lodging</option>
+                        <option value="marker"@if($place->icon == 'marker')selected @endif>marker</option>
+                        <option value="monument"@if($place->icon == 'monument')selected @endif>monument</option>
+                        <option value="mountain"@if($place->icon == 'mountain')selected @endif>mountain</option>
+                        <option value="museum"@if($place->icon == 'museum')selected @endif>museum</option>
+                        <option value="music"@if($place->icon == 'music')selected @endif>music</option>
+                        <option value="park"@if($place->icon == 'park')selected @endif>park</option>
+                        <option value="pharmacy"@if($place->icon == 'pharmacy')selected @endif>pharmacy</option>
+                        <option value="picnic-site"@if($place->icon == 'picnic-site')selected @endif>picnic-site</option>
+                        <option value="place-of-worship"@if($place->icon == 'place-of-worship')selected @endif>place-of-worship</option>
+                        <option value="playground"@if($place->icon == 'playground')selected @endif>playground</option>
+                        <option value="police"@if($place->icon == 'police')selected @endif>police</option>
+                        <option value="post"@if($place->icon == 'post')selected @endif>post</option>
+                        <option value="prison"@if($place->icon == 'prison')selected @endif>prison</option>
+                        <option value="rail"@if($place->icon == 'rail')selected @endif>rail</option>
+                        <option value="rail-light"@if($place->icon == 'rail-light')selected @endif>rail-light</option>
+                        <option value="rail-metro"@if($place->icon == 'rail-metro')selected @endif>rail-metro</option>
+                        <option value="religious-christian"@if($place->icon == 'religious-christian')selected @endif>religious-christian</option>
+                        <option value="religious-jewish"@if($place->icon == 'religious-jewish')selected @endif>religious-jewish</option>
+                        <option value="religious-muslim"@if($place->icon == 'religious-muslim')selected @endif>religious-muslim</option>
+                        <option value="restaurant"@if($place->icon == 'restaurant')selected @endif>restaurant</option>
+                        <option value="rocket"@if($place->icon == 'rocket')selected @endif>rocket</option>
+                        <option value="school"@if($place->icon == 'school')selected @endif>school</option>
+                        <option value="shop"@if($place->icon == 'shop')selected @endif>shop</option>
+                        <option value="stadium"@if($place->icon == 'stadium')selected @endif>stadium</option>
+                        <option value="star"@if($place->icon == 'star')selected @endif>star</option>
+                        <option value="suitcase"@if($place->icon == 'suitcase')selected @endif>suitcase</option>
+                        <option value="swimming"@if($place->icon == 'swimming')selected @endif>swimming</option>
+                        <option value="theatre"@if($place->icon == 'theatre')selected @endif>theatre</option>
+                        <option value="toilet"@if($place->icon == 'toilet')selected @endif>toilet</option>
+                        <option value="town-hall"@if($place->icon == 'town-hall')selected @endif>town-hall</option>
+                        <option value="triangle"@if($place->icon == 'triangle')selected @endif>triangle</option>
+                        <option value="triangle-stroked"@if($place->icon == 'triangle-stroked')selected @endif>triangle-stroked</option>
+                        <option value="veterinary"@if($place->icon == 'veterinary')selected @endif>veterinary</option>
+                        <option value="volcano"@if($place->icon == 'volcano')selected @endif>volcano</option>
+                        <option value="zoo"@if($place->icon == 'zoo')selected @endif>zoo</option>
+                    </select>
+                </div>
+                <div>
+                    <button type="submit" name="edit">Edit</button>
+                </div>
+                <hr>
+                <div>
+                    <button type="submit" name="delete">Delete</button>
+                </div>
             </form>
 
             <p><a href="/admin/places/{{ $place->id }}/merge">Merge with another place?</a></p>