Resolved some layout issues on handset.