More progress
Javasript re factoring
Bind settings