Refactored views a little