style fix and html structure change