Add Active Class and some changes