Pattern cleanup, new button styles