Fixed conflicts
Made password changing work, prepared textbox for removal of swipe button
Removed swipe button