Finish actually implementing last commit in application layout