better UI integrated. Need small tweaks.