added much need back button, general cleanup