Add some icons and fix alignment issues.
Add some icons and fix alignment issues.