Artemis

Working on cleaning up code and improve the overall feel of site