Resolved code conflict.
Code refinejd.
Refined dashboard-layout.html.