fixed tabs and changed some colours