Second Creative tab and minor refactor