#48 Improved Rendering for first list element
Merge remote-tracking branch 'origin/development' into development