Remove debug stuff and fix container width