Added nicer gui (Still WIP)