Correcting spacing on list
Merge branch 'links_on_list' into development
Merge branch 'development'