Enhanced UI