Fixed Modal bug and polished styling a bit