Rearranging and cleanup
Bash now uses a three-line prompt