refactor litle layout stuff