small bug
some layout stuff