Minor improvements on App