changed to new layout, still a bit buggy