Modal dismiss
Icons added
Minor bug fixes and GUI style