frontend, server bug fixes
merging frontend changes