Improve layout. Add icons.