Improve layout. #3