Updated to display more information from DB