front-end fixes
fixes & merges