bit more prettiness, placeholder text and cleanup