Cleanup, documentation and drawable arrangement