Fixed CSS bug and other UI modifications