attempt to improve layout