Refactor UI with infinite scrolling and Company/Investor select box