Commit image view and ui fix bug