Profile icons back to looking right

After lots of confusion, I have scrapped the auto-layout stuff, but
kept the UI Elements where they need to be