Background color changed and some spacing sorted