Revert "Merge pull request #3 from woostrowski/f_new_list_layout"

This reverts commit 1e888feb1e14428a2b0953f76e960d988348a50e, reversing
changes made to 71ca8378f71cebc19d468e84a796d5219102bb52.
Merge pull request #4 from woostrowski/revert_pull_request_1

Revert "Merge pull request #3 from woostrowski/f_new_list_layout"