Fixing BDD scenarios
Working on layout