added new phone formatting
added js for phone input
merged some stuff