minor frontend changes
merge conflict