Refactoring GUI, begging work on first beta