Removed the good ol' placeholders.
Some minor layoutchanges.