General tidy up
New layout & general tidy up