Moved to blocks instead of layout, also scrollspy now kind of works