1. Material Design
2. Layout fixes