More functionality + UI fixes