Updated Control and Enhanced UI