Color changes and moved code