Use nice font size
Simplify and improve PS1
simplify
merge master