finalized work on icons and added user functions