Recomnit of Creative tab and code cleanup