default theme

improvements made on default theme
merge

Conflict fixed
conflict at sidebar fixed