Updated AppTheme, fixed several layouts