fixed button active error thing; some style changes