Added icons to buttons and other changes