New layout colors, cleaned up contexts & views