issue #24 fixed.
Issue #22 implemented. Solution to be refactored.
Issue #26 implemented.
Layout update, buttons use standard IDs for enhanced GUI exp.
A quick and dirty not 100% solution for issue #25