adjusting some details on the view
Merge commit 'ae90d830c7c87e37f8f0ec0b6c825df7df974bbe' into HEAD