Layout improvements for sw600dp
Layout improvements for sw600dp