Fixed some layout issues, added some new ones