fix some issues with current layout