Some more cleanup, extra new lines, z-index, etc