tidy up

Also changed bootswatch theme from United to Simplex (while keeping
Ubuntu font)