Added Icons for buttons and  refactored functions.