fixing some core layout issues and working on the small display issues