Refactored base and added index and article pages