Fixed layout issues and added lots of new styling