update to markup and corresponding theme changes