Add UCM logo and bug fixes