improved UI - part V