Tidy up
Fix front-end app