Clean up and added screenshots