react refactoring
messing about with layout