Fixing the title and some changes on the design