fixed bug, better CSS and HTML