CSS fixes: change height to min-height so that content doesn't overlap on small screens
Merge branch 'dev'