Small fixes layout wise