button and corner fixes