Improved Layout on Class.php page