Upgraded some gems and started on CSS refactor