UI update and bugs fix
New images