Made view separation clearer