Finished removing objects
Fixed elements drawing