improvements and bug fixes in stay-in own layout