Batman's Branch merged with layout updates