Small fixes ( layout )