Refactored views and logic for Fragments pattern