Added FA icons throughtout to enhance usability