refactor so the app styles are the same throughout