Improvement + additions to views/styles