UI Updates

Updates to the initial UI template