UI improvement and bugs fixes