Fix #9, use sub header and modify theme color