merge
add only coal checkbox and visual fixes for top bar
merge