Layout fixes in demo project