improved/fixed views and panels