Added CreativeTab and abit of code cleanup