Remove some obsolete code
#649 New design for various elements for all styles
#649 Fix pagination for some styles