clean up to integrate into parent application layout