Another layout update.

Plus removed some more placeholder texts.