Moved some things around & changed colors