Fixed some design layout issues and made a few tweaks