Improve html and add css