Solved some problems with design.