Added some column classes and made forms inline