Combine and update variables
Clean up of variables and small tweeks

* Refactor flashes
* Change form variables to be consistant with base variables
* Update lists to have no list styles
* Remove margins on headers
* Remove padding in tables