Added categories and better layout for Main activity and Date activity