fixed button and sizing issues