Merge pull request #1 from pandafulmanda/master

moving some files around, attempt to style
fixing age text field