Adding layout as suggested by Raffy