Refectored some view code.