solve bugs and ui changes