Implement various design and layout changes
Move cookies logic to concern