ui improvements & bug fixes
added menu