Layout: Small fixes