moar stylez
Improved stuff on the edit page.
resolve conflict on edit page
merging edit page