Clean up of code for popout code and started work on expanded popout