Fix positioning bug
Further styling tweaks