Improves archive page layout

Also adds handling for more than 3 in each category