fixed some css, added different placeholder text for input
merge