BZ-9549: control flow changes + css changes

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