Cleaning up and work on flyout styling and JS clean up