Bug fixed and styling