Reset Button ~ Other minor Changes