attempt at layout fix