Bug fixes, change from purple to yellow in overlay view