refactored views a little bit