Fixed some layout issues on small screens