Improve layout and display icon