added colors and cleaned up placement