Refactor and clean up website display