reformat reformat function to be split with height changes and width changes
fix format bugs and widget column bugs
Merge commit 'afde9bff0e9a46009d7deb78882fd1d1e71a749e' into develop

Conflicts:
	scripts/script.js