using mainlayout, updated TODO