Some changes and some Views added