Fix some bugs and update CSS