Cleaned up the design and layout