Fixed canvas size, re-organized tabs and other minor changes