Cleanup and colour changes
Outside grid border change
Some color changes