Added button creation and re-organized classes for elements