getting back up to speed, cleaned up, added logout to base template