No more clearfix
Some re-organizing + small fix for pagination