Moved logic out from view
Changed markup to underline the important info