Feature/design9sept

fixing #188 and #148 and small ui changes