Changed layout dramatically. Getting close