Compability Fixes, Better Layout