Type buttons werks now
minor adjustments