finished most of gui
merge changes