modified views and clean up in github