Website Updates

New layout in progress