Refactored Layout and fixed design.