bug  fixes and ui changes
last commit from laptop