front end changes
minor visual change
fixed merged conflicts