fix view margins & rubocop issues