Refactored forms, css, too much for single commit.