UI & Main updates