minor frontend fixes

fixes the following issues:
#2610
#2506 
#2623