Merged and cleaned up portal html