Several app adjustments