Update, added icons, fixed bugs with enter and space