added underline, fixed broken functionality