BZ-9171: Better variable names +semantic markup +responsive

Signed-off-by: Paden <padenportillo@gmail.com>