Refactored some common code into Actor class and fixed a small issue in drawer