Merging changes

btns are fixed DONT OVERWRITE PLEASE
accordion is styled