Some changes
Fixed App class