Layout improvements.
Make nicer in phone.