Fix icon positioning
Improve layout