Theme fixes, Gen. UI updates, Fixed scrolling issue(still needs UI)