Do some markup and styles refactoring
Start the markup works