fixed views and added features