new buttons + some layout kram