Clean up

Removed graphics
Implemented more methods in Activity