Refactor styles and add mock data