Improve layout for compact