removed unused code
added user settings form
organized some stuff during meeting