Tidy up and making more mobile friendly