css bug fix and fine tune