Solved js height/min-height issue with workingish workaround
Merge branch 'feature'