bug fixse
bug and styling fixes