Fixed GUI, fixed a bit more messy code -_-