Fixed styling, and some other little things