Back button works now
Trying to ignore db
UI tweaks
Messages
Merged master into client