Small fixes (layout)
Cleanup