Minor Layout cleanup
Some layout fixing for small screen devices