Little styles fixes and spaces recommendation