fix form styles a bit
git ignore conflict fix