layout fixes and removed old comments