FLOE-178: Merged cindyli's changes and added active tab styling.