merge with sqlite3master
Update landing css
Merge
Checking in and out works on desktop layout again