Updated to use compass and tidy up generally