Customize to improve layout