fixed issue and added icons