Fix css and html bugs and finish layout