Bug fixings with base layout