Improvement html and some miner fix for css