Minor layout fixes for all devices