Changed organization and fixed layout