Changed the ugly green colour and fixed a little issue