fix bug and styling