Chore/restyle staging

Take a look at it!