typos, nomelcature and bringing functionality into new skeletron
more code reorganization for more readable UI/modal logic

slight refactor of small functions to fit with new UI/modal logic