Updated button styles and fixed active behavior