Fix a few bugs, css consistency