added a cancel button to user signin and also maybe some CSS changes? can't remember
Merge branch 'chris'