fixed and changed the layout of some stuff