fixed views and code a bit