Remove UCC Form from portfolio, reorganize layout