Hopefully improve layout somewhat.