fixed bugs and added new icons