Restyle the app
Fix conflict