Style tweaks, made some stuff look better`