Added: Images, New Account and cleaned up