Design - Changes by Alex and Yogesh

1. Style fixes by Alex for issues found while testing
2. Style fixes for iPhone issue