Updated to 3.7 and cleaned up css