adjust Body to remove gaps, fix index conttroller.