Some updates
Updated layout and design.