Cleaned up profile forms a little