fixed some codepro errors
merged ui changes and codepro fixes