Further changes to display content from DB