Clean up & added overlay menu drop down instead of collapse