Fix App helpers, fix views