Tidying markup

Trying to appropriately show/hide stuff