change color theme and layout
fix a margin