Some changes & refreshing looks