Cleanup the markup and styles
Prepare to the redesign