Added colors and fixed views