Finally got layout sorted