UI & issue fix