nearly finished

fixed a view bugs