Redone some of the coloring and icon placement