Fix the content height clitch onec and for all
Remove some whitespace
Include the new files in the make