Merge pull request #15 from torijule/Forms

Forms
updated to ray's new version and added parts
updated to ray's new version adding my locations part to his files
Merge pull request #17 from torijule/map

Map
Trying out new layout