Added several fixes for smaller devices