Satisfy Rubocop + added new front-end things