Fix grid and activity select, modals the only thing left.