Moved Andre's templates into appropriate views