Layout update

I think I'm gonna stick with this