More tweaking of layout for small screen devices