Fix merge; modify application layout.