More UI changes. The checkbox still looks ugly though. :(