added sub containers
improved layouting of several elements