App main small changes