Layout review (in progress...)
Small fixes