tried to unfuck some of the layout