fixes and layout
removed console logs