Major Update containing UI changes and Code implementations