1. Fix up bugs
2. Layout updates for all devices