Improved code structure using Sequence

Combined layers for extra elements button into a single Sequence
variable

Replaced hacks for getting around If returning Null in an argument list
by constructs using Unevaluated[Sequence[]]