General tidy up

Just a general tidy up to make app nicer, also a point to revert back to
if changes in the sqlite database to make app more efficient go pair
shaped :S