Fix conditionals
add view port height
css changes
merge conflict