Improve distribution & app padding