Fixed tabs, added styles, cleaned inconsistancies.
Merged