Clean up and added static content