Using Router for Overlay Activation
Project Cleanup