fixed button issue
moved buttons and have a working active button selector
fixed buttons and current class selector
fixed active button issue
fixed active button issue