Changed padding to margins, rounded edge of mug