basic layout
charts page style
merge issue fixed