Made changes to markup

Based on user survey and client requests
Added icons to appropriate links