Adding mood images, fixing up mood selection screen
Refactoring and fixing a few issues