added more logs, done some changes on UI