Layout fixes.
- Material Design tweaks.