Improve html code and layout