Edited bare layout as attempted fix