Added goals and improved layout