Improve layout of awcy