Seperated Layouts to seperate Actors
Further changes.