General Updates to looks and flow