Added animation to menu, small bugs fixed, ready for merge