Start to make design nicer looking