accordion added and small fixes