Rework some apps