Updated GUI and fixed minor bugs in both.php file