Small fixes for small layout