- switch to Android Studio beta
- layout cleanup