Add z-index to Terminal, fix whitespace issues.

This targets #24 and should fix it probably.