Fix viewport and accordion