Refactored form panel to make location editing usable