Added some styling and code for future form tabs
Fixed bug: expecting name and location when not required