Made the design nicer