Updated lots of finicky layout things