deprecated canvas rearrange + design and code cleanup