Added categories, tidied up View Controller and smoothened animations