simplify some html
add some css transitions