Drastically improve layout