Trunk Merge

* Fixed Bug where admin toolbar would hide when adding a hidden toolbar to tempalte
* Feature Update: Restructuring the way the admin panel works.