Added icons and database choice