Changed idea nad layout