fix layout issues
add icon