improve layout
Add icons, improve layout