Added some styles and logic for goals